Rename ddc_info -> vbeddc_info in interface header.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c
index 33dd905d076b2612f46e803dbe5cad8eb2d9af95..2e087c4103a56d1c97d16196c8976f4b2d8a0378 100644 (file)
--- a/xen/arch/x86/platform_hypercall.c
+++ b/xen/arch/x86/platform_hypercall.c
@@ -227,17 +227,17 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xen_platform_op_t) u_xenpf_op)
             if ( *(u32 *)bootsym(boot_edid_info) == 0x13131313 )
                 break;
 
-            op->u.firmware_info.u.ddc_info.capabilities =
+            op->u.firmware_info.u.vbeddc_info.capabilities =
                 bootsym(boot_edid_caps);
-            op->u.firmware_info.u.ddc_info.edid_transfer_time =
+            op->u.firmware_info.u.vbeddc_info.edid_transfer_time =
                 bootsym(boot_edid_caps) >> 8;
 
             ret = 0;
             if ( copy_field_to_guest(u_xenpf_op, op, u.firmware_info.
-                                     u.ddc_info.capabilities) ||
+                                     u.vbeddc_info.capabilities) ||
                  copy_field_to_guest(u_xenpf_op, op, u.firmware_info.
-                                     u.ddc_info.edid_transfer_time) ||
-                 copy_to_compat(op->u.firmware_info.u.ddc_info.edid,
+                                     u.vbeddc_info.edid_transfer_time) ||
+                 copy_to_compat(op->u.firmware_info.u.vbeddc_info.edid,
                                 bootsym(boot_edid_info), 128) )
                 ret = -EFAULT;
             break;

diff --git a/xen/include/public/platform.h b/xen/include/public/platform.h
index 2b2a595c7730af0fe2773b7cd38d6670fb524cf1..3347666dbf9b8d798bbc8471c409d5aac277a16f 100644 (file)
--- a/xen/include/public/platform.h
+++ b/xen/include/public/platform.h
@@ -147,7 +147,7 @@ struct xenpf_firmware_info {
             uint8_t edid_transfer_time;
             /* must refer to 128-byte buffer */
             XEN_GUEST_HANDLE(uint8_t) edid;
-        } ddc_info; /* XEN_FW_VBEDDC_INFO */
+        } vbeddc_info; /* XEN_FW_VBEDDC_INFO */
     } u;
 };
 typedef struct xenpf_firmware_info xenpf_firmware_info_t;